bitkeeper revision 1.1159.180.4 (419e1ce3xP6qsH24SA4ybMEapaR_LQ)

g/c empty.c

diff --git a/.rootkeys b/.rootkeys
index 33c859e4c4c8ad1f4ae6a5fd389344e9dd332d52..8f915eb9390da80acf4c8d72914d0befd333debe 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -169,7 +169,6 @@
 4107adf1s5u6249DNPUViX1YNagbUQ linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c
 40f56239zOksGg_H4XD4ye6iZNtoZA linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
 40f56239bvOjuuuViZ0XMlNiREFC0A linux-2.6.9-xen-sparse/arch/xen/kernel/ctrl_if.c
-40f56239pYRq5yshPTkv3ujXKc8K6g linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c
 40f56238xFQe9T7M_U_FItM-bZIpLw linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
 4110f478aeQWllIN7J4kouAHiAqrPw linux-2.6.9-xen-sparse/arch/xen/kernel/fixup.c
 412dfae9eA3_6e6bCGUtg1mj8b56fQ linux-2.6.9-xen-sparse/arch/xen/kernel/gnttab.c

diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile b/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
index eef477fe3e6aaf32d451e1b715cad04a59a3ffd9..3e987bee23d2cf2bcca026047a8a26caf170b147 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
@@ -9,5 +9,4 @@ $(obj)/vmlinux.lds:
 
 extra-y += vmlinux.lds
 
-obj-y  := ctrl_if.o evtchn.o fixup.o reboot.o xen_proc.o empty.o \
-           gnttab.o skbuff.o
+obj-y  := ctrl_if.o evtchn.o fixup.o reboot.o xen_proc.o gnttab.o skbuff.o

diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c
deleted file mode 100644 (file)
index 32f03e7..0000000
--- a/linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#include <linux/string.h>
-#include <asm-xen/hypervisor.h>
-
-#if 0
-static __inline__ int HYPERVISOR_console_write(const char *str, int count)
-{
-       int ret;
-       __asm__ __volatile__ (
-               TRAP_INSTR
-               : "=a" (ret) : "0" (__HYPERVISOR_console_write), 
-               "b" (str), "c" (count) : "memory" );
-
-
-       return ret;
-}
-#endif
-
-#if 01
-void
-xen_puts(const char *str)
-{
-
-       (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(str), (char *)str);
-}
-
-asmlinkage int CLPRINTK(const char *fmt, ...)
-{
-       va_list args;
-       int printk_len;
-       static char printk_buf[1024+1];
-    
-       /* Emit the output into the temporary buffer */
-       va_start(args, fmt);
-       printk_len = vsnprintf(printk_buf, sizeof(printk_buf)-1, fmt, args);
-       va_end(args);
-
-       printk_buf[printk_len] = 0;
-       /* Send the processed output directly to Xen. */
-       (void)HYPERVISOR_console_io(CONSOLEIO_write, printk_len, printk_buf);
-
-       return 0;
-}
-#endif